Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 16 May 2010 00:18:09 +0000 (00:18 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 16 May 2010 00:18:09 +0000 (00:18 +0000)

Trivial merge